Scaffold SalHack finally fixed